Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #148

Merged
merged 1,789 commits into from
Jul 18, 2023
Merged

Merge upstream #148

merged 1,789 commits into from
Jul 18, 2023

Conversation

f-fl0
Copy link

@f-fl0 f-fl0 commented Jul 18, 2023

Fixes #147. The following files were edited manually to fix the merge conflicts (https://github.com/alpine-ros/rosdistro/actions/runs/5583218541/jobs/10203306712)

.github/labeler-config.yaml
foxy/distribution.yaml
humble/distribution.yaml
iron/distribution.yaml
melodic/distribution.yaml
noetic/distribution.yaml
rolling/distribution.yaml
rosdep/base.yaml
rosdep/python.yaml
test/rosdep_repo_check/config.yaml

emersonknapp and others added 30 commits June 20, 2023 16:36
…es (ros#37537)

* Add a copy-pastable review checklist for new packages

Signed-off-by: Emerson Knapp <[email protected]>
peci1 and others added 17 commits July 14, 2023 10:34
* Add ros2_kortex src to Iron

This is the Iron version of ros2_kortex which was added to Humble in ros#37893
This ros_kortex was added to Noetic in ros#37856

packages include:
- kortex_api
- kortex_bringup
- kortex_description
- kortex_driver
- kortex_moveit_config

The only name change between ros_kortex and ros2_kortex is:
- kortex_move_it_config -> kortex_moveit_config

The source code is now open here:
https://github.com/PickNikRobotics/ros2_kortex

The repository will eventually be transferred to the KinovaRobotics GitHub organization.
But we will do this after releasing and supporting the initial release.
- ros2-gbp/ros2-gbp-github-org#291
- ros2-gbp/ros2-gbp-github-org#294

Signed-off-by: Alexander Moriarty <[email protected]>

* iron: ros2_kortex add doc entry

Signed-off-by: Alexander Moriarty <[email protected]>

---------

Signed-off-by: Alexander Moriarty <[email protected]>
@f-fl0 f-fl0 requested a review from at-wat July 18, 2023 08:56
Copy link
Member

@at-wat at-wat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@f-fl0 f-fl0 merged commit 6c29a7d into alpine-custom-apk Jul 18, 2023
3 checks passed
@f-fl0 f-fl0 deleted the merge-upstream-2023-07-18-13-19-49 branch July 18, 2023 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge upstream